From c4a23ca99662e67c8b6f5b8bad76d93fc2381ea0 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Tue, 30 Sep 2025 08:45:04 +0200 Subject: [PATCH] umurmur: update to version 0.3.1 Makefile changes ---------------- 1. The location of uMurmur binary was changed to /sbin in release 0.3.1. See release notes [1] 2. I need to specify location of the library file instead of the directory. Fixes: CMake Warning at src/CMakeLists.txt:44 (target_link_libraries): Target "umurmurd" requests linking to directory "/build/staging_dir/target-powerpc_8548_musl/usr/lib". Targets may link only to libraries. CMake is dropping the item. CMake Warning at src/CMakeLists.txt:44 (target_link_libraries): Target "umurmurd" requests linking to directory "/build/staging_dir/target-powerpc_8548_musl/usr/lib". Targets may link only to libraries. CMake is dropping the item. Because of these two warnings, the build fails with undefined references to protobuf-c symbols (e.g. protobuf_c_message_get_packed_size). Patches ------- Removed all of them, because they are included in the upstream source code. [1] https://github.com/umurmur/umurmur/releases/tag/v0.3.1 Signed-off-by: Josef Schlehofer --- net/umurmur/Makefile | 16 +- .../patches/010-umurmur-0.2.20-openssl3.patch | 11 -- .../100-Add-support-for-mbedtls-3.x.patch | 177 ------------------ 3 files changed, 8 insertions(+), 196 deletions(-) delete mode 100644 net/umurmur/patches/010-umurmur-0.2.20-openssl3.patch delete mode 100644 net/umurmur/patches/100-Add-support-for-mbedtls-3.x.patch diff --git a/net/umurmur/Makefile b/net/umurmur/Makefile index 30ed236548..ff25fe10b6 100644 --- a/net/umurmur/Makefile +++ b/net/umurmur/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=umurmur -PKG_VERSION:=0.2.20 -PKG_RELEASE:=2 +PKG_VERSION:=0.3.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/umurmur/umurmur/tar.gz/$(PKG_VERSION)? -PKG_HASH:=b7b2978c3197aef0a6531f1cf0ee1aebb32a55ad8bda43064ce3a944edbcac83 +PKG_SOURCE_URL:=https://codeload.github.com/umurmur/umurmur/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=8327dd0b2c5bd187a38d098295e896a6b85d698c9268205bcb27f6244f760a73 PKG_MAINTAINER:=Martin Johansson PKG_LICENSE:=BSD-3-Clause @@ -65,8 +65,8 @@ endef Package/umurmur-mbedtls/conffiles = $(Package/umurmur-openssl/conffiles) define Package/umurmur-openssl/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/umurmurd $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/umurmurd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $(1)/etc/ $(INSTALL_DIR) $(1)/etc/init.d @@ -78,10 +78,10 @@ Package/umurmur-mbedtls/install = $(Package/umurmur-openssl/install) CMAKE_OPTIONS += \ -DLIBCONFIG_INCLUDE_DIR="$(STAGING_DIR)/usr/include" \ - -DLIBCONFIG_LIBRARIES="$(STAGING_DIR)/usr/lib" \ + -DLIBCONFIG_LIBRARIES="$(STAGING_DIR)/usr/lib/libconfig.so" \ -DLIBCONFIG_LIB_DIR="$(STAGING_DIR)/usr/lib" \ -DPROTOBUFC_INCLUDE_DIR="$(STAGING_DIR)/usr/include" \ - -DPROTOBUFC_LIBRARIES="$(STAGING_DIR)/usr/lib" \ + -DPROTOBUFC_LIBRARIES="$(STAGING_DIR)/usr/lib/libprotobuf-c.so" \ -DPROTOBUFC_LIB_DIR="$(STAGING_DIR)/usr/lib" ifeq ($(BUILD_VARIANT),openssl) diff --git a/net/umurmur/patches/010-umurmur-0.2.20-openssl3.patch b/net/umurmur/patches/010-umurmur-0.2.20-openssl3.patch deleted file mode 100644 index c82541aba6..0000000000 --- a/net/umurmur/patches/010-umurmur-0.2.20-openssl3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/ssli_openssl.c -+++ b/src/ssli_openssl.c -@@ -142,8 +142,6 @@ static EVP_PKEY *SSL_generate_cert_and_k - - Log_info("Generating new server certificate."); - -- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); -- - x509 = X509_new(); - if (!x509) - goto err_out; diff --git a/net/umurmur/patches/100-Add-support-for-mbedtls-3.x.patch b/net/umurmur/patches/100-Add-support-for-mbedtls-3.x.patch deleted file mode 100644 index 45bca4c1c6..0000000000 --- a/net/umurmur/patches/100-Add-support-for-mbedtls-3.x.patch +++ /dev/null @@ -1,177 +0,0 @@ -From fa75e4ca000fc41af0eefd60ac06223c573e0ae4 Mon Sep 17 00:00:00 2001 -From: Glenn Strauss -Date: Thu, 24 Oct 2024 10:07:10 -0400 -Subject: [PATCH] Add support for mbedtls-3.x - -Signed-off-by: Glenn Strauss ---- - src/crypt.h | 1 - - src/ssl.h | 4 +++ - src/ssli_mbedtls.c | 65 +++++++++++++++++++++++++++++++++++++++++++--- - 3 files changed, 66 insertions(+), 4 deletions(-) - ---- a/src/crypt.h -+++ b/src/crypt.h -@@ -36,7 +36,6 @@ - - #if defined(USE_MBEDTLS) - --#include - #include - - #define CRYPT_AES_KEY mbedtls_aes_context ---- a/src/ssl.h -+++ b/src/ssl.h -@@ -53,6 +53,10 @@ - #include - #endif - -+#if (MBEDTLS_VERSION_MAJOR >= 3) -+#undef USE_MBEDTLS_HAVEGE -+#endif -+ - #if defined(USE_MBEDTLS_HAVEGE) - #include - #define HAVEGE_RAND (mbedtls_havege_random) ---- a/src/ssli_mbedtls.c -+++ b/src/ssli_mbedtls.c -@@ -37,10 +37,16 @@ - #include - #include - --#include - #include --#include -+#if defined(MBEDTLS_USE_PSA_CRYPTO) -+#include -+#else -+#include -+#include -+#endif -+#if MBEDTLS_VERSION_MAJOR < 3 - #include -+#endif - #include - #include - -@@ -64,13 +70,32 @@ const int ciphers[] = - 0 - }; - -+#if MBEDTLS_VERSION_NUMBER >= 0x03000000 -+#if !defined(MBEDTLS_USE_PSA_CRYPTO) -+#ifdef MBEDTLS_ENTROPY_C -+static mbedtls_entropy_context entropy; -+#ifdef MBEDTLS_CTR_DRBG_C -+static mbedtls_ctr_drbg_context ctr_drbg; -+#endif -+#endif -+#endif -+#endif -+ - static mbedtls_x509_crt certificate; - static inline int x509parse_keyfile(mbedtls_pk_context *pk, const char *path, const char *pwd) - { - int ret; - - mbedtls_pk_init(pk); -+#if MBEDTLS_VERSION_NUMBER >= 0x03000000 -+#if defined(MBEDTLS_USE_PSA_CRYPTO) -+ ret = mbedtls_pk_parse_keyfile(pk, path, pwd, mbedtls_psa_get_random, MBEDTLS_PSA_RANDOM_STATE); -+#else -+ ret = mbedtls_pk_parse_keyfile(pk, path, pwd, mbedtls_ctr_drbg_random, &ctr_drbg); -+#endif -+#else - ret = mbedtls_pk_parse_keyfile(pk, path, pwd); -+#endif - if (ret == 0 && !mbedtls_pk_can_do(pk, MBEDTLS_PK_ECDSA) && !mbedtls_pk_can_do(pk, MBEDTLS_PK_RSA)) - { - ret = MBEDTLS_ERR_PK_TYPE_MISMATCH; -@@ -127,6 +152,13 @@ static void initKey() - #ifndef USE_MBEDTLS_HAVEGE - int urandom_bytes(void *ctx, unsigned char *dest, size_t len) - { -+#if (MBEDTLS_VERSION_MAJOR >= 3) -+#if defined(MBEDTLS_USE_PSA_CRYPTO) -+ mbedtls_psa_get_random(MBEDTLS_PSA_RANDOM_STATE, dest, len); -+#else -+ mbedtls_ctr_drbg_random(&ctr_drbg, dest, len); -+#endif -+#else - int cur; - - while (len) { -@@ -135,6 +167,7 @@ int urandom_bytes(void *ctx, unsigned ch - continue; - len -= cur; - } -+#endif - return 0; - } - #endif -@@ -160,10 +193,20 @@ void SSLi_init(void) - #ifdef USE_MBEDTLS_HAVEGE - mbedtls_havege_init(&hs); - #else -+#if MBEDTLS_VERSION_NUMBER >= 0x03000000 -+#if defined(MBEDTLS_USE_PSA_CRYPTO) -+ psa_crypto_init(); -+#else -+ mbedtls_ctr_drbg_init(&ctr_drbg); -+ mbedtls_entropy_init(&entropy); -+ mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, NULL, 0); -+#endif -+#else - urandom_fd = open("/dev/urandom", O_RDONLY); - if (urandom_fd < 0) - Log_fatal("Cannot open /dev/urandom"); - #endif -+#endif - - /* Initialize config */ - conf = Memory_safeCalloc(1, sizeof(mbedtls_ssl_config)); -@@ -187,7 +230,11 @@ void SSLi_init(void) - #endif - mbedtls_ssl_conf_dbg(conf, pssl_debug, NULL); - -+#if MBEDTLS_VERSION_NUMBER >= 0x03000000 -+ mbedtls_ssl_conf_min_version(conf, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_3); -+#else - mbedtls_ssl_conf_min_version(conf, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_1); -+#endif - - mbedtls_ssl_conf_ciphersuites(conf, (const int*)&ciphers); - -@@ -209,8 +256,15 @@ void SSLi_deinit(void) - #ifdef USE_MBEDTLS_HAVEGE - mbedtls_havege_free(&hs); - #else -+#if MBEDTLS_VERSION_NUMBER >= 0x03000000 -+#if !defined(MBEDTLS_USE_PSA_CRYPTO) -+ mbedtls_ctr_drbg_free(&ctr_drbg); -+ mbedtls_entropy_free(&entropy); -+#endif -+#else - close(urandom_fd); - #endif -+#endif - } - - bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash) -@@ -223,8 +277,15 @@ bool_t SSLi_getSHA1Hash(SSL_handle_t *ss - } - #if MBEDTLS_VERSION_NUMBER < 0x02070000L - mbedtls_sha1(cert->raw.p, cert->raw.len, hash); --#else -+#elif MBEDTLS_VERSION_NUMBER < 0x03000000L - mbedtls_sha1_ret(cert->raw.p, cert->raw.len, hash); -+#elif !defined(MBEDTLS_USE_PSA_CRYPTO) -+ mbedtls_sha1(cert->raw.p, cert->raw.len, hash); -+#else -+ size_t hash_length; -+ mbedtls_psa_hash_compute( -+ PSA_ALG_SHA_1, cert->raw.p, cert->raw.len, hash, -+ 20 /* client_t member uint8_t hash[20] */, &hash_length); - #endif - return true; - } -- 2.30.2